Merge "Ported r112366 from 1.19wmf branch indefinitely."
authorReedy <reedy@wikimedia.org>
Wed, 2 May 2012 17:12:02 +0000 (17:12 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 2 May 2012 17:12:03 +0000 (17:12 +0000)

Trivial merge